Merge from origin/emacs-26

author Glenn Morris <rgm@gnu.org>

Mon, 7 Jan 2019 19:51:23 +0000 (11:51 -0800)

committer Glenn Morris <rgm@gnu.org>

Mon, 7 Jan 2019 19:51:23 +0000 (11:51 -0800)
author Glenn Morris <rgm@gnu.org>
Mon, 7 Jan 2019 19:51:23 +0000 (11:51 -0800)
committer Glenn Morris <rgm@gnu.org>
Mon, 7 Jan 2019 19:51:23 +0000 (11:51 -0800)
diff --cc src/font.h
Simple merge
diff --cc src/window.c
Simple merge
author	Glenn Morris <rgm@gnu.org>
	Mon, 7 Jan 2019 19:51:23 +0000 (11:51 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Mon, 7 Jan 2019 19:51:23 +0000 (11:51 -0800)
		1	2
src/font.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history